netstat: Fix duplicate keys in libxo output #1331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bramton
changed the title
bramton
added a commit
to bramton/freebsd
that referenced
this pull request
Jul 19, 2024
Duplicate keys in libxo output have been given a unique name. PR: 244589, 254672 Pull Request: freebsd#1331
bramton
changed the title
gmshake
reviewed
Jul 22, 2024
| @@ -711,7 +711,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) | |||
| "secret\n"); | |||
| p(sctps_timopathmtu, "\t\t{:pmtu-timer/%ju} " | |||
| "{N:/PMTU timer%s fired}\n"); | |||
| p(sctps_timoshutdownack, "\t\t{:shutdown-timer/%ju} " | |||
| p(sctps_timoshutdownack, "\t\t{:shutdown-ack-timer/%ju} " | |||
bramton
added a commit
to bramton/freebsd
that referenced
this pull request
Jul 23, 2024
The current libxo output uses the "dropped-packets" key for both incoming and outgoing packets. This commit distinguishes between the two by adding an "in" and "out" suffix. The original "dropped-packets" key is kept for backwards compatibility for now. PR: 244589 Pull request: freebsd#1331
bramton
added a commit
to bramton/freebsd
that referenced
this pull request
Jul 23, 2024
The key "shutdown-timer" was present twice in the libxo output. The second occurence of "shutdown-time" has been renamed to "shutdown-ack-timer". PR: 254672 Pull request: freebsd#1331
|
Thanks for reviewing. I have split the commit into two seperate commits. |
bsdimp
reviewed
Aug 23, 2024
usr.bin/netstat/if.c
Outdated
| @@ -501,8 +501,11 @@ intpr(void (*pfunc)(char *), int af) | |||
| IFA_STAT(ipackets), link|network, 1); | |||
| show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors), | |||
| link, 1); | |||
| /* Below is kept for backwards compatibility. Will be removed in the future. */ | |||
There was a problem hiding this comment.
It might be good to s/in the future/before FreeBSD 16/
|
And question: do we need to bump the version for this? libxo man pages are kinda silent about when to do that. |
@bsdimp IMO, for the fixes, |
bramton
added a commit
to bramton/freebsd
that referenced
this pull request
Aug 27, 2024
The key "shutdown-timer" was present twice in the libxo output. The second occurence of "shutdown-time" has been renamed to "shutdown-ack-timer". PR: 254672 Pull request: freebsd#1331
netstat didn't have version information yet. This is added in 0d2e74b. |
The current libxo output uses the "dropped-packets" key for both incoming and outgoing packets. This commit distinguishes between the two by adding an "in" and "out" suffix. The original "dropped-packets" key is kept for backwards compatibility for now. PR: 244589 Reviewed by: imp, zlei Pull Request: freebsd#1331
The key "shutdown-timer" was present twice in the libxo output. The second occurence of "shutdown-time" has been renamed to "shutdown-ack-timer". PR: 254672 Reviewed by: imp, zlei Pull Request: freebsd#1331
NDFREE_PNBUF should be called after checking the return value of vn_open(), and should only be called once. Reviewed by: imp, zlei, Kornel Dulęba <[email protected]>, Elliott Mitchell Pull Request: freebsd#1338
i2c -sv or i2c -rv prints an uninitialized field i2c_opt.addr. Suppress the verbose message entirely for scan and reset, where it provides no information, and zero initialize the field. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279261 Reviewed by: imp Pull Request: freebsd#1345
|
I've had to (partially) revert this pull request. For the bits I reverted, please resubmit as a new PR. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves Bug 254672 and Bug 244589